Merge from mainline.
authorEli Zaretskii <eliz@gnu.org>
Sat, 2 Jan 2010 10:57:50 +0000 (05:57 -0500)
committerEli Zaretskii <eliz@gnu.org>
Sat, 2 Jan 2010 10:57:50 +0000 (05:57 -0500)
commita77284ebfbd97e8548ec4915b0db4a9305e7e434
treebdae27fe44a0bbc087ca41e27f1bba3bee73ea9c
parenta9b50d572b802a4a50bb34cbbd40c4a507cf9655
parent7019bc9fb8fc871a0e06b9965b20b3f1ae4bc7ba
Merge from mainline.